Code Format and comments