- Some code improvements
- Some comments added