#18 more clean up