diff --git a/lib/src/functional/types.dart b/lib/src/functional/types.dart
index 2eeaf02..48cb08a 100644
--- a/lib/src/functional/types.dart
+++ b/lib/src/functional/types.dart
@@ -1,9 +1,9 @@
 export 'types/callback.dart';
 export 'types/constant.dart';
+export 'types/curry.dart';
 export 'types/empty.dart';
 export 'types/identity.dart';
 export 'types/mapping.dart';
+export 'types/partial.dart';
 export 'types/predicate.dart';
 export 'types/throwing.dart';
-export 'types/curry.dart';
-export 'types/partial.dart';
diff --git a/test/math_test.dart b/test/math_test.dart
index 165e0f6..7bdd6c4 100644
--- a/test/math_test.dart
+++ b/test/math_test.dart
@@ -48,7 +48,7 @@ void main() {
   group('bit', () {
     final powersOf2 = List.generate(32, (i) => math.pow(2, i).toInt());
     group('bitCount', () {
-      expectBitCount(int value, int expectedBitCount) {
+      void expectBitCount(int value, int expectedBitCount) {
         final bitCount = value.bitCount;
         expect(bitCount, expectedBitCount,
             reason: 'Expected $value (0b${value.toRadixString(2)}) '
diff --git a/web/rtree/rtree.dart b/web/rtree/rtree.dart
index 3f889ea..2d1bb40 100644
--- a/web/rtree/rtree.dart
+++ b/web/rtree/rtree.dart
@@ -5,11 +5,11 @@ import 'package:more/collection.dart';
 
 const guttmann = 'guttmann_';
 
-final select = querySelector('#select')! as SelectElement;
-final clear = querySelector('#clear')! as ButtonElement;
-final random = querySelector('#random')! as ButtonElement;
-final canvas = querySelector('#canvas')! as CanvasElement;
-final console = querySelector('#console')! as ParagraphElement;
+final select = querySelector('#select') as SelectElement;
+final clear = querySelector('#clear') as ButtonElement;
+final random = querySelector('#random') as ButtonElement;
+final canvas = querySelector('#canvas') as CanvasElement;
+final console = querySelector('#console') as ParagraphElement;
 
 var tree = createTree();
 var index = 0;