Minor changes/polishing