refactoring = less lines! *yay*