Code cleanup
Remove mutable objects from function args