kgs-cleanup, style changes