Cleaning up some more code