small typo
remove not implemented
code polishing