Code cleanup
code refactoring

- corrected class naming
- slightly more documentation