More Style Cleanup