Coding style - blank line before returns
Docblock fixes
Coding style fixes