Minor cleanup
TODO inserted: name consolidation.