organize some stuff. Its prettiER