Stylistic changes, extract commented code to private method