Makes confirm optional if the question is empty

also cleans up codebase alittle