Cleaning up code
Modifying scoring
Working code, but very ugly