clean up whitespace
change to markers & test on OS X
generalize comment