Reduce namespace depth. Add some description