Cosmetic tweaks
Refactoring
refactor/tidy