task06 - fix little's complain about messy coding
task06 - fix little's complains