Code cleanup
Fixed timezone runtime warning
Fixed Future warning