Code review and cleanup

[yveszoundi]

Need to see if some of the code can be simplified for maintenance purposes.
Remove obsolete or unused settings, create issues for enhancements if relevant.

This is not a big application, it's not necessarily as straightforward as it could be.