Format fixes for helpers