Going a little step in direction namespace cleanup