Further simplify shit