code cleanup

changed a few tags as well