J.L.
I'm a super neat person and it may be as simple as changing your expectation. My daughter, four, puts everything away at night. Its a really big deal to her to read books at night so when she puts everything away, we read as many books as we have time for. I'm big on not rewarding expected behavoir. There are nights when we can only read for a bit, but that's what happens as a result of delay.
So everything will be clean in the morning, but I don't expect toys picked up throughout the day. In fact, mess is hugely important for creative play so although I'd love a clutter free home, I know she's learning though all the mess.