Some minor cleanups in code
Merge branch 'master' of https://github.com/flajann2/embracer