Cleanup + 1 bug fix

See commit comments for details.

I can understand if some things are only matter of **my** personal prefs, just let me know.