Use succinct code

Tidy up b77def64925b02f1192ed85df482abbd3f13b171

See #3