Fixed weird spacing, comments, and Scanner