refactor(error): clean-up direct error formatting (part 3)

refactor(error): clean-up direct error formatting (part 3) #2023