Mostly cleanup to conform to Dart coding style