Cleaning Things Up

Just a bit of cleanup in preperation for the next release. Good things
on the way :)