Refactory for github page