some changes

make better after reading  Effective Java