@returns -> @return
clickStartedWithinContainer -> clickStartedWithinCanvas
OdfCanvasAdapter -> MockOdfCanvas
Merge pull request #340 from kossebau/codeCleanups

Code cleanups (as seemed useful today)