Code cleanup & Timezone fix

! Cleaned up code, change variable names
+ Fixed timezone set to number larger than 23 or smaller than 0