- code make simpler
#6