Removed an unneeded level of indirection