Sanitized form elements and moved code to be in proper naming conventions
removed several security warnings and general coding standards warnings