Clean up style nits