cleaning up - naming and removing commented lines out