Simplified existing code.