further cleaing up