Tag: refactoring the code