refactor tags, whitespace