cosmetics + lint

fix private member names, indentation, lint errors