Minor changes for code consistency