Refactor into more awesome