further cleaning up of program library