code tidy; single page test