Some Cleanup of logic in the Category List