refactor of my papaer