Cleaned up my CS a bit