more style/indentation fixes