Merge branch 'guidelines'
Applied coding guidelines to more files

Increases readability
Merge branch 'master' into guidelines