Reformatted to follow PSR-2