Code: Minor improvement