Got cleaned up just a bit