Refactor (more) old code
Update statistics for 9/10 - 9/15