Ox: improve code a bit