Code refactoring in flutter

Published --