Added more comments

- More comments added
- Minor source code formatting