more useless refactor