Fix some indentation and same-line comments