Clean up assoc
Merge pull request #3 from phuu/clean-up-assoc

Clean up assoc