minor changes/cleanup