Small code-improvements.