minor cleaing-up