Library
- code clean-up
- fixed mistypes