Refactored small changes
Updated UML-diagram