Minor (code-)improvements

Some minor code-improvements.