Code style fixes
Code style fixes
Cleanup code
Code style fixes