cleanup minor issues