minor code cleanup and beautification
fixed and enhanced overzoom