Refactoring

Good catch