remove confused comments, fix remaining indentation: