Refactor Rewsly