Add more rules to clean up output