Minor changes because formatting