Code cleanup
Update bulk form whitespace strip regex to be an include