Resolve #3477454 "Code consistency checks"

Closes #3477454

added 3 commits

• 64a05498 - updates formatting and variable usage for consistency
• e1330b4a - optimizes row construction and variable declarations
• 6201046d - empty options

Compare with previous version

added 1 commit

• 7df6324a - adds validation checks and removes redundant checks

Compare with previous version

marked this merge request as ready

merged