Clean up, bring up-to-date and apply consistent formatting.