continuing with clean-up and improvements