Cleaning da house! (refactoring)