More work on clean up of descriptions/arch