Tidy up code: proper naming etc
Print nicer stats