consolidate feed constants, cleanup