Refactor repo, remove class based view