Refactor, also added statistics for nr of users for one day