cleaning up/reorganizing solution