Refactoring, fix testem, improve the README