- Fix recognition of whitespaces at the end of all lines
- Reorganizing code