Reformatted and commented methods