Fix coding standard violations
Merge pull request #110 from cs-shadow/coding-standards

Fix coding standard violations