Fix [#1], code cleanup to index page.