Refactor for usability – minor