Fix bug
Code clear up
update README