Minor adjustements for consistency