Replaced private struct with member variables