Refactoring/inline class