doc strings and reorganization