quick cleanup of some dirty code