Clean up class words before using them