Minor refactor for cosmetics