Simplified some things.