Some refactoring, created taglib.