minor cleanup based on comments