minor fixes
style update
Merge branch 'master' of https://github.com/asvd/helios-kernel