Refactored SomeClass a little bit