Format ending better