Cleaned up and made UTC offset configurable