[Issue #94] Fixed code conventions