Removed level of indirection