cleaning up cs a bit