comment cleanup & window.width issue