s, a, i, p okish
further cleanup