Samarion develop

Some code hygiene contributions. If you agree, merge this into your branch and rebase to get rid of the merge commit.