Refactor [] returns to ArrayList returns