MainView codestyle improvements