Minor fixes and comment cleanup