comment + refactor