console log and comment cleanup