Code cleaned up some more