Hourly usage & Refactoring