small changes
Cleanup.
Add getCurrentTime.
Remove unused imports.