refactor for prettiness