Formatting for GitHub, cleanup.