Code cleaned up a little bit