Change daemon variable & simplify some option code