3.0 - Cleanup

Just some minor code and docblock cleanup
Well, the docblocks say `@return void`, and there were no erros after removing the returns :) I admint, that might have been a little shortsighted. In what situation exactly would a mock make use of the return?