Refactoring methods to handle object creation & destruction.