Avengers Assemble/Refactor