Reordering and Simplifications.
Merge branch 'master' of https://github.com/achim86/samples