Little refactor:
1. Adding/removing comments
2. Extracting parsing logic to it's own file