PyCharm formatting changes and a todo for bootstrapping.