clean up
Merge branch 'refactoring'