Formatting and organisation
Merge branch 'master' of https://github.com/mien/private.xml
Formatting and organisation