Nice refactor