Refactoring: class to struct