As you already go through style cleanups here, I was thinking about removing the excessive use of "{" "}" there around one-liner if-else-statements.