Lots of tidying up. Variable renaming and duplicate method removal. That sort of thing.


git-svn-id: https://source.sakaiproject.org/svn/portal/branches/SAK-23349@133242 66ffb92e-73f9-0310-93c1-f5514f145a0a