cleanup based on comments from martine