Tidy whitespace and commenting