Appropriate comments and minor tweaks for symbol generation