Refactor: Don't have to pass session around