Code cleanup and maturity while making custom requests