gustafn
committed
on 24 May 18
minor changes for consistency