[Issue #94] Fixed uml and code conventions