cleaning up of code

Fixing HTML 5 forms plus incorporating coding standard