Additional comments, improved naming