Refactor: code cleanup and fixed zoom bugs