Code: Minor improvements