Refactoring. RE-FAC-TO-RING! Look ma, I did it! *sheds a tear*