Housecleaning

Just some minor cleanups...