Minor code style cleanup
Merge branch 'feature-update' of https://github.com/jneurock/viking-base into feature-update