Clean up, refactor QAction