rollback some codestyle changes