Refactoring of the paper