some cleanup changes