style; cleanup; fixes