Reformatted and passes all tests