tidy up all formatting