Cleaned up the work space a bit finally!