refactor a wee bit