Reformatted for PSR2 conformance