Simplify the dumb stuff I did