Code cleanup

Shouldn't actually change anything, but the code is much neater, and
compliant again.