Fix Oiawesome's messy coding