URBNG-14 Fixed comments after review.