Small code cleanup
Merge pull request #1 from Nicolai-s/patch-1

Small code cleanup