cleaned up wikiform