[Issue #80][Finished] Fixed code conventions and update uml