Craig: Fixed up some styling stuff. Removed some unused variables.