removed unnecessary indirections