cleaning up code and making final design changes