Cleaning up code before moving to imports on imports