Fixing code stink