Tidy up boilerplates.