Cleaned up a lot of code in zone file. Also lowered time to saves.