refactoring and setting default time zone