Remove comment and fix some indentations