Added copy as well as little style changes