Code clean up by DartEditor and more small fixes.