Copy improvements

A few improvements are also useful for my original project. I had wished you had created a pull request with this ;)
Won't copy. Ensures a clean style