Further Item Re-work and Cleanup