adjust code styling
Merge branch 'simple-aint-easy'