Adding goTop, cleaning files