Minor code fixes
Comment fixes