Added Hour to Notification. Also cleaned up.