minor: code refactoring following upstream coding conventions
Merge pull request #14 from sensorii/tidy

minor: code refactoring following upstream coding conventions