Atempt to cleanup and find markup issue, see #648

In response to #648