Refactor ugly bits