Style changes
Cleanup