Refactoring

Movin around thiiings
Formatting
Merge branch 'feature/molten-nincodium' into develop