Minor styling fixes to get this work ready
to merge.