Don't repeat yourself, I'm cleaning up some code and removing some lines