Minor changes/cleanup