clean up + comment