refactoring taglib
refactored taglib