Removed mutable arguments where it is obvious that is not what is intended