Cleaned up server form code.