- code refactoring
- small fixes
- added some method descriptions

Signed-off-by: easymodo <easymodofrf@gmail.com>