Updated comments, fixed whitespace