warnings & newlines
Merge branch 'refactoring' into develop