Small network cost calculation improvement and cleanup