Source Formatting

- Adjusting comments
- Removing unneeded whitespace