Cont. (code/lib cleanup)