Updated to use PSR-1 standards