removed unnecessary variable; removed unnecessary constructor;