behave goes classic, minor refactors