Code cleanup
Code cleanup
Code style fixes