Minor changes/formatting