cleanup based on comments