- house keeping: organizing fields, naming fields a little bit better
- added moar comments