Fix doc-blocks in header and fix codestyle issues

I fixed the docblocks (as I did with the newly added checks yesterday) more according what is used in CakePHP.

I also fixed some codestyle. :)