Cleaning up code again