Extra commenting plus general reorganization