Documentation cleanup
Simplify some syntactic cleverness