Refactoring & single line comments