more clean up and formating
screenshot added
Merge branch 'master' of https://github.com/dpnabais/cemrock