Used PyCharm to do some auto-formatting and remove unused stuff