Address comments raised in early development
Success!