Refactor and add FAQ