If you want cleaner code: Fix it yourself.

\cc @karlitschek I'm outta here. Search someone else to fix this. THX!