a little changes make the code clean.