#33 Refactor