Remove useless comment
Increase the write-card! test
Refactor - remove redundant functions, reuse existing and tested ones