Cleanup

 * dictionary literal for clarity
 * generators ftw