punctation and comment cleanup