Fixing the code guidelines for the remaining files

If the PR #15 is merged, this PR fixes the remaining files to follow the coding guidelines. This fixes #3