* swapping nerdcommenter for tcomment
 * tidying up