Refactor <3