Code reformat to follow PSR-2