Even slightly better formatting