Continue to clean up the code