more cleanup and added semantic web tags