Some more refactoring of the velocity marshaller and adding comment to the velocity marshaller and the template processor