Final Tidy Up

Final housekeeping