Repository: methods movement & typos