Apply 'Cane' coding standards to current codebase
Merge pull request #2 from domness/task/cleanup-cane-violations

Changes in response to default Cane violations