changed tags and cleaned code