Minor cleanup and fix