Fix small missing tag mistakes
More useless code removal
Indentation fix