style and test cleanup