Reformat with PyCharm
Clean up imports