Comment editing; code clean-up