Bit of refactoring
Merge branch 'refactoring'