fix warnings (and indent)