Amends as per reviews (removed full namespace)