Add syntax highlight and cleanup.