Inserting form actions, adding comments and cleaning/organizing code