Refactor. But is it more readable?!?!