misc cleanup

different minor things:
- consistency,
- dart coding conventions,
- some code simplification.