nit - could you clean up all those extra-space changes? it would make reviewing the commit easier