Tidy up alignment