code and comment cleanup