PSR2 fixes and removed debugging statement