cleaned up and added to set categories