Refactoring, further modelling