Other things:
- Updated code comments & fixed indentation
- Removed an old QQ (temporary) comment that does not apply anymore