Added coding style fixes and updated comment for option