Refactoring for Vayleryn