Issue #278 code convintions