cleanup fast code, test for style