Source formatting

- Removing whitespace
- Updating comments