Code reformatted to comply to PSR-1/PSR-2