Clarify code
Comments
Rewrite test with testify package