I cleaned up my CS a bit