improve readability, adjust tags