cleaned up comments as-per feedback.