Reformatting code to PSR's 0-3