Core/Battlefield: some codestyle changes