(cleanup) Removed mutability where it is not needed.