refine request structure - use category
deleted some unnecessary code bits