Made classes to remove unnecessary array lists