minor cleanup refactor