Actual qom-syntax and cleaner structure