Cleanup qml a bit