Cleaning code and refreshed dev environment.