Code syntax improvement