in process of cleaning code