Fixed function formatting