- Minor cleanup