cleaing up a bit