edited whitespace and comments