optimisation testing
Revert "optimisation testing"

This reverts commit 56553ffc16ce4fb55076628855d042866262effd.
whitespace fixing
Merge branch 'performance' into mamashelter