Style fixes and cleanup