finally fixing my code style for dart