Clean up style
More Cleanup