Cleanup: aligned function parameters
Cleanup: inverted conditional branch for improved readability
Settings: added missing key-value pair