[Issue #92] Fixed code conventions