Fix html indent problems
Remove minor redundancy