Cleaned up comments and minor formatting tweaks for turn in