[WIP] clean up

This is the way phpspec does it by default. PHPSpec has its own conventions (such as using underscores in method names and not explicitly making functions `public`). When in `phpspec`, do as `phpspec` people do.