Refactoring, and removed bulky examples from three