Cleaned up working space