UP-3823 - Cleaned up the comments