make some cleanup changes