More comment cleanup and fixing requirements