small changes + reorganizing