Improved comments

- Improved comments
- Removed (apparent) superfluous code