Refactors to set timezone