Another refactorings. Simplify classes
Some internal work, nothing serious
Minor, minor
Just added few lines on README