comments added and PSR-2