Cleaning and parts now in arraylist, more dynamic