Misc code format
Misc comment fix