more cleanup and making things make sense.