Refactor little
Merge branch 'Refactor'