Fix formatting, make sure it passes pylint better.