Refactor for more prettiness