FEATURES: Small tidy up for constancy and grammar