Improve cosmetics
Refactor use of tags