Improvements and simplifications to the usage logger