General Refactor, :maki: