re-organizing and cleaning