Revert "Small improvements"

This reverts commit 3832b05d6bc9b981baf87cc539cd359a19884023.
Revert 97a2c50..b095490

This rolls back to commit 97a2c5020ff6dcf7d83668fa7d676c377d1ba743.