commented refactor