Need another level of indirection
Spacing and typos