Revert "Issue #285 fix code conventions"

This reverts commit 7955b55154435847bfd1ac87b68a61656cae56ec.