s6 ceaning up a bit