Refactor some code, yo!