Some cleanup based on scrutinizer feedback.