[Issue #189] corrected code convetions