adding some cleanup