Just cleaned up some code