[controller] Cleanup/Optimize