A couple of small changes for easier re-use.

I've made a couple of small changes that allow the code to be used a little more easily without needing to copy the whole project.