TRUNK-2768
Cleaned up comments
TRUNK-2768
Cleaned up Comments