Test style cleanup