[Issue #189] Fixed code conventions