Minor package cleanup