Some formatting and phpdocs cleanup