cleanup codes, add new category classes