Refactored document