Minor code improvment