list-comp

change some for loop to list comprehension
init with tuple

change initializing with tuple to dict initializing style
Revert "init with tuple"

This reverts commit 1ece437946b03fafb1cfd1d6ac33469f46d4b8f9.
init with tuple

change Dict's initializing with tuple to dict initializing style