quickie refactor and stutff

still doesnt like stuff?