see #174 - tidy