cleanup docs, remove dict comprehension (for 2.6)