some cleanup based on feedback