Cleanup IGF

- Make methods simple
- Fix indents
- Add JavaDOCs