Updates to follow PSR standards.