Cleanup and update, add prefix to category methods