Replaced explicit arrays with pointers