Some code cleanup. Thanks to "systemcrash".