Removed use of mutable arrays