Cleaned up StyleTester which was half-merged