Fix: Code cleanup

I replace space-tabs by actual tabs, remove trailing spaces, align code, adjust exis