dan/ken: remove comments and whitespace