code cleanup about Qom