Minor tidies. Be consistent about returning this