syntax cleanup based on feedback