fixing and simplifying cut copy paste