cleaning up bits and pieces