Code clean up - Removed form tag