- Make comment style preference configurable from settings file
- Adjust block comment indentation
- Cleanup code