marvel-se-refactoring