Refactoring: Encapsulate state methods