Refactor sign up form