revise all program to follow PSR-2