Comments added following Best Practices