Project only works in python3
Tidy up