Fix some indention and simplify the comments
Fix more indention
Fix indention