Refactor signin form