6.0

make code cleaner