Doing a little refactoring.
Merge branch 'dev-refactoring'