Posting Russell's refactorization of the class