Code Restructure : No Longer Uses ArrayList