checked refactor, fixed bug multiline comment