moar idea cleanup stuffs