Minor code clean-up
Fix zoom around point