minor clean up based on feedback