Cleaning up formatting