moat clean up 2nd day

going well