Small code cleanup, just the obvious stuff