Begin improving formatting