Some style fixes
Cleanup