Rearranged stuff with PyCharm