Implement (style) comments in PR #6

- Remove commented out config
- Consistent spacing
- Udate comments
  - remove extra info from long ones
  - add comment to _default_ keyword