Daily counter
Code cleaning