a small start on reorganizing and cleaning