- fixed formatting and phpdocs