more clean up, prepared for integration in other projects