Added a SimpleStrategy and some tidy-up