Fine tune white space rendering
remove commented code