Fixed comments and indentations