Doc comments + clean up