Minor code style changes
Merge branch 'development' of https://github.com/RIVeR-Lab/kvh into development