rename overload helper and whitespace fixes