Form handler class cleaned up