did some cleanup on each page.. almost done