issue #22 & #26: fixing coding standards issues