Modify code cleanup
Modify searchforms