Updated comments & whitespace.