Add comments and improve portfolio index