format_normal and format_return functions enhanced