Simplified some stuff