minor fixes + indentation cleanup