Style cleanup
More versatile timezone support