Cleanup

There are no functional changes in this PR.
Only lintian and other style fixes in order to make things more readable.