Iteration 2 of clib + clean up