some cleanup/reorganizing