elliotoille - a cleanup of an even older thing ^^ honestly I’m so...