QML refactoring