cleaning up our code