Reorganizing code and working on anonymous form submission