Some cleanup/doc