cs cleaned up a bit