Cleanup.
Add getCurrentTime.
Remove unused imports.
Merge pull request #3 from chiro/cleanup

Cleanup