Further poll cleanup, added daemon variable