Cleaned up py-file