work on TODO + clean