Finish refactor client form code.