refactoring: extracted var
cleanup: commented code