Minor improvement to form!