PSR2 violations fixed. Close #3