Code clean-up, category list ne tumwe tunhu