Cleanup and structure UserInterface class