cleaing up code