shorter/cleaner version