methodise form and option creation
remove todo comment