Code review

Test pull req using `hs submit`