removed unnecessary final variables