Code: Minor changes