Organize imports
Merge pull request #657 from yueh/organize-imports

Organize imports