Some little changes on code.