- style changes
- removed some comments