clean up parser main functions;

next need to close content_for tag