WIP clen up code