Refactor vic sponge