Some cleanup and docs.