clean up minor stype various