- Updated Readme information
- Code cleaning and small refactoring