removed unnecessary arrays, commented methods and issues