Minor Changes

Minor changes to spacing and a few variable names. Also removed a silly
debug line that I left before.