Tidy up includes

- removed unnecessary includes
- moved includes to where they are actually used.
Remove some repeated lines.
Make more comments more accurate and meet styling guide.
Merge pull request #587 from cfailde/includes2

Tidy up includes
Merge pull request #589 from cfailde/comments

Make more comments more accurate and meet styling guide.
Merge pull request #588 from cfailde/master

Remove some repeated lines.
Fixed casing