continuing to clean up code