Fix indentation, some unidiomatic constructs.