Remove verbose code
Update comment
add tests