additional clean up based on feedback comments