Some doc and cleanup