refactored tagging
Merge pull request #4 from ksdaly/refactoring

refactored tagging