Refactored method name
Move CSV stuff to own class so it doesn't add clutter