Minor changes / formatting