o Lots of code restyling to pass CI tests.