[#708] Minor refactor