Some changes according to ErikFang's suggesting.