Formatting in a more review-friendly way