Simplified some input.