house keeping tasks - clean up and better documentation