Simplified some stuff.