Endpoint fine tuning + cleanup