[AutoPaster] Refactoring