refactor and added quesitons and answers