Code Standards/PHP Doc improvements

Improvements to code base to follow coding standards,
and improve phpdoc validation from PHP Codesniffer rules