Replaced Vector with ArrayList
Removed an ununsed variable