Fleshing out, cleaning up