Refactoring
- Changed Parsing
- Added Logger