Refactor glance