Simplified some code.
Simplified some code.