fixed skipped page and cleaned code