Clean-up + added timing relative to page width