UI-class created and some code formatting