- Improved comments
- Split long methods into submethods
- Better use of builders
- Fixed possible ClassCastException