Nice refactor!