General tidying/linting
Remove redundancy in page links generation