SAK-12563

Tweaks and cleanup from detail review.



git-svn-id: https://source.sakaiproject.org/svn/web/branches/SAK-12563@119993 66ffb92e-73f9-0310-93c1-f5514f145a0a