Refactoring: add a little more of Qt