goTop refactor