Cleanup & doc update