further fixes in the same area
removed pointless variable