Processing cleaup; comment cleanup