adding a form id for the testing
better comments, removing some unused code