Extract a couple of methods and commenting