code clean up
fixed zone import