Minor cleanup and update