Break out normalization into its own method; add a comment to keep me from geting confused
Merge branch 'master' into classerate