Added maybe construction into formatting to simplify