Style fixes
Test clean up fixes