remove unnecessary require of trim.pl
clean up spacing
additional minor cleanup