Continuing to clean up code