Rename userForm and fix some indentation