Minor clean up to code
Updated include links