Updated to meet PSR-2