Just cleaning up some code