cleanup and make tag start and end configurable