Refactor to anaphoric forms for cleaner code