QuietHours : Cleanup and fix