Fix styling issues identified by xo