Fix a range of stylistic issues in Bilevel
More refactoring in Bilevel.