Style changes
Adjust warnings