:hurtrealbad: Refactoring