reorganizing and cleaning up