Style and test cleanup