Refactoring and tagging of code