[#855] Refactor based on feedback from @iperdomo