Adding Code review comments and suggestions for code extension.