Refactoring Magitek