Minor changes for uniform style