markup fixes / cleanup