Fixed code style, remover unused codes, added test
Fixed other bugs in code style
Removed unused code, updated readme