Cleaned up some tags