Move methods and add comments