Cleanup of tags parser