Slight coding improvement