Work on includes...
Some minor cleanup