I was using the template as-is from the article. Personally I like the brevity of your version much better. If you don't mind, I would love to use it.