Code cleanup.

Reformat code, reorganize imports, removed some unused variables.
Merge pull request #7 from mesos/cleanup

Code cleanup.